Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 24 Feb 2010 22:24:48 +0000 (22:24 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 24 Feb 2010 22:24:48 +0000 (22:24 +0000)

Trivial merge